From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 16 Apr 2013 14:10:51 +0000 (+0300)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~3615^2~229^2~63^2~36
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=83b9062422faef46592618bed64e5df47fe13670;p=emacs.git

Merge from trunk.
---

83b9062422faef46592618bed64e5df47fe13670